Merge "Better fix for gettid() sim-eng breakage from last night."

#include <fcntl.h>

#include <stdio.h>

#include <sys/stat.h>

#include <sys/syscall.h>

#include <sys/types.h>

#include <unistd.h>

#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <utils/threads.h>

#include <android_runtime/AndroidRuntime.h>

// have gettid, so we just ignore this and don't log if we can't

// get the thread id.

static bool should_time_binder_calls() {

#ifdef __NR_gettid

  return (getpid() == syscall(__NR_gettid));

#ifdef HAVE_GETTID

  return (getpid() == androidGetTid());

#else

#warning no gettid(), so not logging Binder calls...

  return false;