Merge "Use PRODUCT_OUT instead of ANDROID_PRODUCT_OUT"