Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02 Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f