am 88fbb5f4: (-s ours) am 215ecb93: Merge "Restore untrusted glStencilMask...
am 88fbb5f4: (-s ours) am 215ecb93: Merge "Restore untrusted glStencilMask value on resume after functor"
* commit '88fbb5f4':
Restore untrusted glStencilMask value on resume after functor