Merge "Found root cause of Monsoon error and fix it" am: ddb83af8cb
am: d65ec7f4cc

Change-Id: I70d82803e209f488a4f4708356b862829fe0f3fa
tree: 674156c6d6a29e98c2e24d2a337efb85030423dc
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg