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

* commit 'e84d5dfdd8d60a93ffb577fabf30e98f977210b9':
  More wifi direct CTS tests