Merge changes from topics "framework-wifi-test-defaults", "frameworkwifiapitests-mk-to-bp"

* changes:
  Revert "Convert FrameworksWifiApiTests mk to bp"
  Revert "FrameworksWifiApiTests: build against framework-wifi"