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

Change-Id: Ie34dec7cb1d2276b76ac2fd0f52ad6a58aa9660c