Merge "dx: Improve MethodHandle annotations"
am: bc682afc86

Change-Id: Id0e7be823eb2a243357d01606ec1978053365207