This reverts commit ac9514a452. The new gettid dependency caused other breakage. Change-Id: I74a75e40c30a45beb275f9dd38eb5c7beac15fbd
ac9514a452