Merge 47446290c8a38eae1478053766b4ed2af8120be8 on remote branch

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