am 0e5a6b12: merge from froyo-plus-aosp

Merge commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0'

* commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0':
  Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
  AndroidConfig: define HAVE_PTHREAD_SETNAME_NP