Merge "MethodHandles: Track libcore change eb497095e03068459."