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

Change-Id: I02e5f658073719309d829f74c2be455ca19778b2