Change-Id: I655091f116cde662933ed96d926372a14a435dfc Former-commit-id: 91a3fdbc8bd98603a1cda218729d5542dac809ef
Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f