[automerger skipped] Merge "Add PRODUCT_HOST_PACKAGES for all host modules in...
[automerger skipped] Merge "Add PRODUCT_HOST_PACKAGES for all host modules in PRODUCT_PACKAGES" am: de419999 am: 2b2db542
am: a2a2d1c7 -s ours
am skip reason: change_id I830ea918dca5766a8269aa1cd38f26cdb1c18969 with SHA1 b22fe69c is in history
Change-Id: Ie7e49809523a93c8aa8c5fc495d8b263d30fef24