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

Change-Id: Ief1b1646f7ed2d22e70aa2346eb7ac5c17880640