Merge tag 'android-5.0.0_r5' into HEAD

Android 5.0.0 release 5