Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507 Former-commit-id: b027914534dc808a616e2b5b2ee55ed3dd304b2e
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f