Merge 9beedb7743c91f655a0574e94b50d9e019ee5924 on remote branch

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