git merge android-6.0.0_r26 on to remote branch

Change-Id: I7bf0f551884263032e2b5246ea757c99a8e4a9cb