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

Change-Id: I8ab4671aff49bc47e257a8ca5c34c53f66017a9e