Merge "Update test expectations for 712-varhandle-invocations." am: 2e26772330
am: 11b1ad593d

Change-Id: I7605de13ec88a2fc3729bfd830aee9199411fe59