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

Change-Id: I5f0852f5062fc773d1a384344733b407867aa596