Merge "Change to use the aosp_product.mk under /build/make/target/product"
am: 8dbe71c9f9

Change-Id: I79bc219d96e2a7d3c1f58c889cc523189d229cc3