Merge "Generalize CompactDexDebugInfo offset table" am: 8dbb4ba7ff
am: 1863c67ecb

Change-Id: I22804d470bf09d5fb494e7b426cd84af9fbe13f1