Merge "Minor fixes after the big cleanup" am: f5667c1e8f
am: 6684f23edf

Test: None
Bug: 65563975

Change-Id: I2f16664b898d427dc91498b67bfc7d273d6ba10c
(cherry picked from commit 87d8891fb050684dfddf6eca3a9897539ce80c63)
2 files changed
tree: c69a1d8162bf8918149f465ca9576ee4a437cf09
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg