Stop using __DATE__/__TIME__ on all builds am: d8383dc45e
am: 90ca457b95

Change-Id: I5efab2621639fccffa8ad545cde7551e98f46d2b