Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f Former-commit-id: 2342170ce4cf51f12759afa26fc5af46f35c6188
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f