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

Change-Id: Id73537c01113cf7ae574b141b0b7e7e831fc33cd