Expose sky KeyboardService in android mojo_shell

shell/android/native_viewport_application_loader.h

Index: shell/android/native_viewport_application_loader.h
diff --git a/shell/android/native_viewport_application_loader.h b/shell/android/native_viewport_application_loader.h
index 53716e646c7e3cb82fb104487cdc116c487edc40..02552f48c68c5b6be0f6388fd35d02505d1c6a3e 100644
--- a/shell/android/native_viewport_application_loader.h
+++ b/shell/android/native_viewport_application_loader.h
@@ -26,7 +26,7 @@ namespace shell {
 class NativeViewportApplicationLoader
     : public ApplicationLoader,
       public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::Keyboard>,
+      public mojo::InterfaceFactory<keyboard::KeyboardService>,
       public mojo::InterfaceFactory<mojo::NativeViewport>,
       public mojo::InterfaceFactory<mojo::Gpu> {
  public:
@@ -51,9 +51,10 @@ class NativeViewportApplicationLoader
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<mojo::Gpu> request) override;
 
-  // mojo::InterfaceFactory<mojo::Keyboard> implementation.
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::Keyboard> request) override;
+  // mojo::InterfaceFactory<keyboard::KeyboardService> implementation.
+  void Create(
+      mojo::ApplicationConnection* connection,
+      mojo::InterfaceRequest<keyboard::KeyboardService> request) override;
 
   scoped_refptr<gles2::GpuState> gpu_state_;
   scoped_ptr<mojo::ApplicationImpl> app_;