Merge "Generalize CompactDexDebugInfo offset table"