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

Change-Id: Ib42f406c0f083ce57dbcfb29f839959a8cf7f168