Merge "Change to use the aosp_product.mk under /build/make/target/product"