Merge "Add TEST_MAPPING for DexManager etc." am: 6c35ea901c
am: 3b5704316f

Change-Id: Ieb38cdc4a320c9f91e447840bb979c2211242968