Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" am: ca98e2866e am: 2fd4a1c4be am: 4ce52911a3

Change-Id: Id4452f8e0cf073cbf330bf1c4645a578df583997