Merge "Rewrite aosp_sunfish.mk to inherit aosp_product.mk"