Merge "Move wifi.proto to shared service .jar"