Merge changes from topic "acts-p2p-service-discovery"

* changes:
  p2p: avoid false alarm in service discovery test
  p2p: fix test path in config
tree: 22d0a8a7d26ede380159ddc669d44d263b28cce6
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg