Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739 Former-commit-id: 065be6691bf102699dc7ece3424f6972792c4d6f
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f