git merge android-6.0.0_r26 on to remote branch

Change-Id: I21221e289ca2904b10184ac46a15719743e51ccb