Fix PRODUCT_BUILD_PROP_OVERRIDES