Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Stop building __DATE__/__TIME__ into Android binaries

Change-Id: I525a08015d5f5ffeae4f2737bec215fe240d900d