Merge branch 'android-3.10'