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

Change-Id: I9d744d7c41dab923ab776159c5a9b4be680e7249