Merge "Stop using __DATE__/__TIME__ on all builds"
am: 8229d435c9

Change-Id: I89887fd3a7ce2e5507ebfcffb2f90a47935947c1