Merge "Handle the test hunging issue."
tree: 3d86e6be7d250e8c470f1e7db8fe6ab515b433ac
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg