merge android-4.12_r2.1