Merge remote-tracking branch 'common/android-3.10' into android-x86_64-fugu-3.10