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

Change-Id: Ic19c87d032a084f16478c0452a9b49ce51856ef9