Merge "Fix for host simpleperf \'gettid\' unsat."
am: 650f6809a3

* commit '650f6809a39d8116f8f13f527c65372b80070f5e':
  Fix for host simpleperf 'gettid' unsat.