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

* commit 'd63680fbc4da40fc6b29039e04d6a38137d38021':
  Remove auto-gen project.properties