Merge tag 'android-5.0.1_r1'

Android 5.0.1 release 1