Merge bd4fb7e755ee4336a2ff710b0f0c54eec7f34a61 on remote branch

Change-Id: I299f871cac54709adf26eefa99373df83d8aaaaf
tree: cd040fe1eaca75a6c7111fcad090e2b9e10106c9
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg