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

Change-Id: I327261502980cef4be517e757a337966abd66d23