Revert "resolve merge conflicts of 359041d5c41f56d6167abdfc70aca681860e1f7c to master"

This reverts commit 64dcbe24aefde4f074f4f1f7a4a45721f7356cc5.

Reason for revert: b/174217958

Change-Id: Ic625ca6de0feb2d47ad8aa0599b51eb57737b26f
3 files changed
tree: 1bf61a7418fcf566e0e6902b87313b7801ffb72d
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg