Merge "Fix for host simpleperf 'gettid' unsat."