Merge "Remove host packages from PRODUCT_PACKAGES"
am: c4f99b56ec

Change-Id: I337c75eb13762fa86bb6a683b256866481514c0a