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

Change-Id: Ib86a5c6905f8bfe9a5453ee187ab14dc842a0f5f