Merge "SystemServer: Dynamically load wifi-service"