Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3 Former-commit-id: 182b9f69c72332e73cdda26ebbebedb4abc059b0
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f