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

* commit '2abff32d30745ec496a22f8950abc133934b63a4':
  Fix for host simpleperf 'gettid' unsat.