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

Change-Id: Ica295383b9f39ecac9d8543ecf341190f7209ded