Merge "dex/TEST_MAPPING: referenced non-test modules"
am: 81f32238ea

Change-Id: Ib5d5a4dc6002d530d8fedbac8e8de9b06cb73ec9