Merge "Stop using __DATE__/__TIME__ on all builds"