Merge "dx: Fix for MethodHandle interning" am: e803bc6c4b
am: 96d7340216

Change-Id: Ia3f3ed6fb8502df7b460c0ddcf88c4f49dc7d046