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

Change-Id: Ia86a0a6e913ba11e8fe7860f194bc041d4ab49d1