Merge tag 'android-5.0.0_r6' into HEAD

Android 5.0.0 release 6