Merge change 25360 into eclair

* changes:
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing