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

Change-Id: I7020e18da617f6fd3762304b6048102f427222f1