Merge 7a9e351940185163533f32fc415accdfc77dbc21 on remote branch

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