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

* commit '2384a4dceedc1218aaaf62bb91e4a05cdbe3425d':
  Remove auto-gen project.properties