Merge "Explicitly reference framework-wifi app build rule"