Merge "dx: Improve MethodHandle annotations" am: bc682afc86 am: b95b4fac6f am: 40a825d4d9
am: f62eaf5cf0

Change-Id: I896ba5d897302288cc77b6ab888718ed51a30c85