Merge "Rename ANDROID_PRODUCT_OUT -> PRODUCT_OUT."