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

Test: None
Bug: 65563975

Change-Id: I3c1d4443741faac104d2e7659df62711e8a5df9c
(cherry picked from commit 83b85b3e01433c003c7fba9f6bbc1deb1a78d02b)
1 file changed
tree: c8fb51ec4974b2235d5fcbfd784a6fba352d7de9
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg