Merge "Stop building __DATE__/__TIME__ into Android binaries"
am: 2ff4c9f142

* commit '2ff4c9f142dad825037ea13bdf737662caf64a25':
  Stop building __DATE__/__TIME__ into Android binaries