Fix overriding of build properties

Change-Id: I35c73536df0202f1c79bed8110f93c4620344ecf