Merge "Stop building __DATE__/__TIME__ into Android binaries"