Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Add Gradle Plugin 1.4.0-beta6.

Change-Id: I98bcea9c400c0e6dd66ec885a04d8035594d298c