[automerger skipped] Remove device-only modules from PRODUCT_HOST_PACKAGES
am: 698158b4e6 -s ours
am skip reason: change_id I9e18810e4abdbd771aac7e6191849a24a890cc0b with SHA1 fda7c056d3 is in history

Change-Id: I1dbc8e4185d22db6518ab0b8d6f7f17a06644361