Revert Monsoon change but catch more exceptions am: cd4a0a5c21 am: 44b6d67584 am: 01ec9e3800
am: ed30c67c75

Change-Id: I7e5583c8e6faffbf712846ab4d3793af6d165a55
tree: 6f115f412886537a9ee1b2fa536fff149c749a68
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg