Merge "Revert "SystemServer: Dynamically load wifi-service""