Merge "Revert "Add wifi long traffic test for upload"" am: 7bc8be6012
am: 7fe667cdf4

Change-Id: I633c8e3bb1dd4938df3787d69e9fc8845efb835c
tree: 6e975a34bc2f0597319c6182d7843e3b9d532774
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg