Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  TestingCamera1/2: Disable dex preopt

Change-Id: I79fb35d8b16b905408c1c7b0f35cf6ec230fe309