Milestone-1
Merge tag 'android-4.1.2_r1' into HEAD

Android 4.1.2 release 1