Merge "dx: Improve MethodHandle annotations"