Fix overriding of build properties

Change-Id: Iec8b8ab900ff7c7dcbbe3ddc976e2627c44ca51f