Merge "ART: Type conversion fixes for MethodHandles" am: 58ddad4e8b
am: 632f2aa34f

Change-Id: I9959c4323b1929140a10a994a7fbbd76451fd170