Merge cd6ecf013b6e316caf14d39523f7854ee3f1b0f5 on remote branch

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