Merge "Updated the UTs to match changes made in aosp/968252."
tree: d163db059b920b627be3d4f1d2997f7798af77cb
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg