Merge "Use PRODUCT_OUT/HOST_OUT instead of OUT/ANDROID_HOST_OUT"