Merge "Modify test script to consolidate config params" am: 5122038302 am: 9bbaee6ce1
am: 2d06ce1ea7

Change-Id: I3de2168cfd08215960536dc91827a3182e56f902
tree: 224d958effbb6105e6cb98e406e6f36b5870fdc3
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg