Merge "Generalize CompactDexDebugInfo offset table"
am: 8dbb4ba7ff

Change-Id: I284efebde55ea6fb4b4439356eaa777d819e9620