Merge 9b592f2f13ad76bd8e0d2d17f4efaa1d2ed21548 on remote branch

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