Merge 2789eb3298dd98bf39269ced16304aa609caf01f on remote branch

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