am e70f4ed1: am f8d88579: Merge "Remove HAVE_GETTID."

* commit 'e70f4ed1d1bd558e04ab7ae181e7197c4e46e1b0':
  Remove HAVE_GETTID.

diff --cc core/combo/include/arch/darwin-x86/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-arm/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-mips/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/linux-x86/AndroidConfig.h
Simple merge

diff --cc core/combo/include/arch/target_linux-x86/AndroidConfig.h
Simple merge