Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Remove ENABLE_TIMESTAMPS to ensure reproducible builds.

Change-Id: If8fdfc8235083a8e54aba72953f7c95753e5adb7