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

Change-Id: I3086ea2c178eee4787d12fa17f60d6920eb59219
tree: ae0088590e0468f604e34b260a185e05d4cfb69a
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg