Merge tag 'android-5.0.1_r1' into HEAD