Merge "Always check result of Thread::ModifySuspendCount" am: 0d8cf9106c
am: 8d9802319e

Change-Id: I5483436018a3a2f2d607edde37b30ce5461196d4