Merge tag 'android-5.1.0_r5' into HEAD