Merge "Fix the unit test with go/aog/669423." am: e37d41ca3c
am: ac70bdc342

Change-Id: Ic0e5f1aaa0e9981d1c706757c081ff511881ac46
tree: 274bf00cae411e6e1fa5d93561fd7217a99d3459
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg