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

Change-Id: I4e24ad0d3fe261fe5387bb1738f93847581a09a0