am f61bfdb3: Merge "More wifi direct CTS tests" into jb-dev

* commit 'f61bfdb31eea34f90db88907e32e2b49fe18264c':
  More wifi direct CTS tests