Merge "Remove unnecessary PRODUCT_HOST_PACKAGES" am: ce9d2ba5cb
am: fbdc0fd279

Change-Id: Id1f83a583a35550c641b0f37d999cee4e84c7c6d