Merge "Ensure GetThreadState works with Thread subtypes" am: 1ebe51d9 am: 5113351a am: 1ea2e6ff am: 38b24298 Change-Id: I08c7d30cadc01c1bb68234471b709f454a8058ae