Merge "Add TEST_MAPPING for DexManager etc."