Merge "Remove host packages from PRODUCT_PACKAGES"