Merge "dx: Improve MethodHandle annotations" am: bc682afc86
am: b95b4fac6f

Change-Id: If981b71bb99454f3b7fd1888c01c301a34d858d5