merge latest android-3.4 and v3.4.75