Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1