sky/shell updates for Android and iOS

sky/shell/android/platform_service_provider_android.h

Index: sky/shell/android/platform_service_provider_android.h
diff --git a/sky/shell/android/platform_service_provider.h b/sky/shell/android/platform_service_provider_android.h
similarity index 65%
rename from sky/shell/android/platform_service_provider.h
rename to sky/shell/android/platform_service_provider_android.h
index 679c7640e8ab8298ab62c5a5615ed44bf2633389..682835646a19fb19e444e36cb0efe635d64c4ebc 100644
--- a/sky/shell/android/platform_service_provider.h
+++ b/sky/shell/android/platform_service_provider_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_SHELL_ANDROID_PLATFORM_SERVICE_PROVIDER_H_
-#define SKY_SHELL_ANDROID_PLATFORM_SERVICE_PROVIDER_H_
+#ifndef SKY_SHELL_PLATFORM_SERVICE_PROVIDER_ANDROID_H_
+#define SKY_SHELL_PLATFORM_SERVICE_PROVIDER_ANDROID_H_
 
 #include <jni.h>
 
@@ -15,4 +15,4 @@ bool RegisterPlatformServiceProvider(JNIEnv* env);
 }  // namespace shell
 }  // namespace sky
 
-#endif  // SKY_SHELL_ANDROID_PLATFORM_SERVICE_PROVIDER_H_
+#endif  // SKY_SHELL_PLATFORM_SERVICE_PROVIDER_ANDROID_H_