Add mark-stack related assertions in marking phase
am: 1592cfc31c

Change-Id: I86a59e8f7babb3b4d53b22ed6c4b3ebd6183f519