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

Change-Id: If76f554d29f56660e89ced484e72a79f12fd659a