Merge "Revert "Build framework-wifi against core_current & framework-sy...""