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

Change-Id: I43692ed3fa2231f21df85ce3a5533666ef7f716d