Merge "Fixed a bug that caused a positional argument to be consumed." am: 54ffa99701
am: 81e46e9169

Change-Id: I3b32a26452c5328ae19f4643a56fa3993e10f2d4
tree: 9c9173d807ca5ca2d1bfdaabfc600109c4fc0ea9
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg