Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  Remove __DATE__ and __TIME__ from tracing

Change-Id: I1d54f05f34e8b9c313813619ce14f62e61cb7f9d