Merge "Remove non-module names from PRODUCT_PACKAGES"