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

Change-Id: I091fed808e68662a1b8224d03c81dfd4bf9e65b4