sky/shell updates for Android and iOS

sky/shell/service_provider.h

Index: sky/shell/service_provider.h
diff --git a/sky/shell/service_provider.h b/sky/shell/service_provider.h
index 87460b8c4b32888b4a3f4a166621630e8ece2c4b..f7c381808692686761205a39b8787a6bb48013e1 100644
--- a/sky/shell/service_provider.h
+++ b/sky/shell/service_provider.h
@@ -18,13 +18,10 @@ namespace shell {
 
 class ServiceProviderContext {
  public:
-#if defined(OS_ANDROID)
-  ServiceProviderContext(
-      scoped_refptr<base::SingleThreadTaskRunner> runner)
-    : java_task_runner(runner.Pass()) {}
+  ServiceProviderContext(scoped_refptr<base::SingleThreadTaskRunner> runner)
+      : platform_task_runner(runner.Pass()) {}
 
-  scoped_refptr<base::SingleThreadTaskRunner> java_task_runner;
-#endif
+  scoped_refptr<base::SingleThreadTaskRunner> platform_task_runner;
 };
 
 // Implemented in platform_service_provider.cc for each platform.