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

Change-Id: Ib0d9338c2f8fdc51321336d978e82100da861008