Merge "Add module names to emulator PRODUCT_PACKAGES."