am 8eb2bad5: am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"

* commit '8eb2bad59852fddbf7cd77ccdb18411691c6c0f1':
  Add emulator modules to PRODUCT_PACKAGES in full and sdk products