Merge "Reduce max_concurrent_scans and max_concurrent_scans, remove unused instances" into pi-dev
tree: 8f0878f7b3af395f409248e58df6e3cf2a8bd122
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg