Convert 'thread to mark-stack map empty' assertion into a CHECK am: cb177da21e
am: e5d4ba63df

Change-Id: I940dd5f8ba759a37e20af09027c809ef15793917