Merge "dx: Fix interning of call site items" am: 1d0cc6a929 am: 94f73e7ace
am: abcb19cff6

Change-Id: I2980cade0ef49c8d61197c62fe6e600cb7d815c2