am 8843620c: Merge change 25360 into eclair

Merge commit '8843620cb208904bb9583809c9cfbe9e41264ae0' into eclair-plus-aosp

* commit '8843620cb208904bb9583809c9cfbe9e41264ae0':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing