Merge "Remove host packages from PRODUCT_PACKAGES" am: c4f99b56ec
am: 4a406e583f

Change-Id: I847240453cc2edbe09ad2df8d3c5082882c5f47c