Merge tag 'android-5.1.0_r1' into HEAD

Android 5.1.0 release 1