am 671d90ea: Merge "Add module names to emulator PRODUCT_PACKAGES."

* commit '671d90ea1d20312df60b700748d49dac17054099':
  Add module names to emulator PRODUCT_PACKAGES.