Merge "Ensure GetThreadState only counts user-code suspensions" am: 71a8e5b25f am: e87557b9d0
am: 56b5da2645

Change-Id: I678c593288cc34744a20acdd06450a292d574157