Merge "Merge "dex/TEST_MAPPING: referenced non-test modules" am: 81f32238ea" into stage-aosp-master am: 55053f86d7
am: 4b703140ab

Change-Id: I0a86b4266d59ee7912cc58873c3f2abe8a748ac3