Fixes

PRODUCT_BUILD_PROP_OVERRIDES is not working and we don't need it.