Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  DO NOT MERGE Split GLES31 copy image tests in 3.

Change-Id: I1c553a7a9e9a8bbb5d2401c0e4503483a982c984