Merge "Otapreopt: Load properties from files" into nyc-dev
am: b25c2d3

* commit 'b25c2d375c400556a553f64744d4a080add6a68c':
  Otapreopt: Load properties from files