Merge "Merge tag 'android-6.0.0_r26' into HEAD"