Merge "dex/TEST_MAPPING: referenced non-test modules"