Merge "Match Wi-Fi HAL native code style with rest of HALs."