Merge "Revert "Default undefined PRODUCT_SHIPPING_API_LEVEL to fake treble""