Merge "speedy: update PRODUCT_BUILD_PROP_OVERRIDES" into gingerbread