Merge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750
am: 20e7d03d7d

Change-Id: Ic5b74f775ea34b5ccfd5b98bbf11ca8da546787c