cleanup build properties

Change-Id: I00461f94f9321588af4e4327ef403dcaab081e74