Fix for device setup pairing inconsistency am: a66b34029d
am: 30ed2f8b0d

Change-Id: I597db4a4c2f53e26854fd397478970fbb87b7653
tree: e0e8f9bcaa905e6acf3626c53cfd758675c9e812
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg