Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Theme colored ic_preview_pause and ic_preview_play icons

Change-Id: I1275f41084b569faed63ed55583c2d0819ba49d7