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

Change-Id: If51dce95c2779790a845c0462655e5f68cf1b1bf