Cleanup blimp/client/core code organization.

blimp/client/core/context/android/blimp_client_context_impl_android.h

Index: blimp/client/core/context/android/blimp_client_context_impl_android.h
diff --git a/blimp/client/core/android/blimp_client_context_impl_android.h b/blimp/client/core/context/android/blimp_client_context_impl_android.h
similarity index 87%
rename from blimp/client/core/android/blimp_client_context_impl_android.h
rename to blimp/client/core/context/android/blimp_client_context_impl_android.h
index 5457ca45c0425409d469dea3467c13e76e29ccf7..415c8af6a099de58a735fe90982089d2cbf77396 100644
--- a/blimp/client/core/android/blimp_client_context_impl_android.h
+++ b/blimp/client/core/context/android/blimp_client_context_impl_android.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BLIMP_CLIENT_CORE_ANDROID_BLIMP_CLIENT_CONTEXT_IMPL_ANDROID_H_
-#define BLIMP_CLIENT_CORE_ANDROID_BLIMP_CLIENT_CONTEXT_IMPL_ANDROID_H_
+#ifndef BLIMP_CLIENT_CORE_CONTEXT_ANDROID_BLIMP_CLIENT_CONTEXT_IMPL_ANDROID_H_
+#define BLIMP_CLIENT_CORE_CONTEXT_ANDROID_BLIMP_CLIENT_CONTEXT_IMPL_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
-#include "blimp/client/core/blimp_client_context_impl.h"
+#include "blimp/client/core/context/blimp_client_context_impl.h"
 
 namespace blimp {
 namespace client {
@@ -63,4 +63,4 @@ class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_CORE_ANDROID_BLIMP_CLIENT_CONTEXT_IMPL_ANDROID_H_
+#endif  // BLIMP_CLIENT_CORE_CONTEXT_ANDROID_BLIMP_CLIENT_CONTEXT_IMPL_ANDROID_H_