Merge "De-duplicate inline info in stack maps." am: 8d97f400f5
am: db24c436af

Change-Id: Ibf2e3d5c5e59547c96ee475b4cbe7f8014d2d2ad