Merge "Remove host-only packages from PRODUCT_PACKAGES"
am: 716f2bd5bb

Change-Id: I86fad630ef0a72c833783b7284c9d9e3fcfaa318