Split //blimp/client/core to relevant parts.

blimp/client/core/contents/android/blimp_contents_factory.h

Index: blimp/client/core/contents/android/blimp_contents_factory.h
diff --git a/blimp/client/core/android/blimp_contents_factory.h b/blimp/client/core/contents/android/blimp_contents_factory.h
similarity index 67%
rename from blimp/client/core/android/blimp_contents_factory.h
rename to blimp/client/core/contents/android/blimp_contents_factory.h
index d839e2f0320040b62fac2aae9ac1a4774faa5fdd..ce41a97d13f6ee5ece9900e37be790ec95ec7608 100644
--- a/blimp/client/core/android/blimp_contents_factory.h
+++ b/blimp/client/core/contents/android/blimp_contents_factory.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 BLIMP_CLIENT_CORE_ANDROID_BLIMP_CONTENTS_FACTORY_H_
-#define BLIMP_CLIENT_CORE_ANDROID_BLIMP_CONTENTS_FACTORY_H_
+#ifndef BLIMP_CLIENT_CORE_CONTENTS_ANDROID_BLIMP_CONTENTS_FACTORY_H_
+#define BLIMP_CLIENT_CORE_CONTENTS_ANDROID_BLIMP_CONTENTS_FACTORY_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
@@ -17,4 +17,4 @@ bool RegisterBlimpContentsFactoryJni(JNIEnv* env);
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_CORE_ANDROID_BLIMP_CONTENTS_FACTORY_H_
+#endif  // BLIMP_CLIENT_CORE_CONTENTS_ANDROID_BLIMP_CONTENTS_FACTORY_H_