Merge from open-source gingerbread

Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c

diff --cc libs/utils/Threads.cpp
index ad9a94f,0b360f4..b1bd828
--- 1/libs/utils/Threads.cpp
--- 2/libs/utils/Threads.cpp
+++ b/libs/utils/Threads.cpp
@@@ -774,10 -774,8 +774,11 @@@ int Thread::_threadLoop(void* user
              self->mExitPending = true;
              self->mLock.lock();
              self->mRunning = false;
 +            // clear thread ID so that requestExitAndWait() does not exit if
 +            // called by a new thread using the same thread ID as this one.
 +            self->mThread = thread_id_t(-1);
              self->mThreadExitedCondition.broadcast();
+             self->mThread = thread_id_t(-1); // thread id could be reused
              self->mLock.unlock();
              break;
          }