Change-Id: Ida090030fa029633e2f1e8b967131a4806c8ebe2 Former-commit-id: 3fa55526310ca6cfa7b2b054296ced7321f86480
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f