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