am 9487df9a: Merge "Remove auto-gen project.properties"

* commit '9487df9a0f54bc1b572dff04a6b4c9f741d88d42':
  Remove auto-gen project.properties