Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products"