Restructure contents of blimp/client.

blimp/client/app/android/blimp_client_session_android.h

Index: blimp/client/app/android/blimp_client_session_android.h
diff --git a/blimp/client/session/blimp_client_session_android.h b/blimp/client/app/android/blimp_client_session_android.h
similarity index 83%
rename from blimp/client/session/blimp_client_session_android.h
rename to blimp/client/app/android/blimp_client_session_android.h
index 0e0497ca89165eac0a7faa1df469a32893329d7d..bdcdf9b4f78626b5db5981454a1f4fe3c706f342 100644
--- a/blimp/client/session/blimp_client_session_android.h
+++ b/blimp/client/app/android/blimp_client_session_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 BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_ANDROID_H_
-#define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_ANDROID_H_
+#ifndef BLIMP_CLIENT_APP_ANDROID_BLIMP_CLIENT_SESSION_ANDROID_H_
+#define BLIMP_CLIENT_APP_ANDROID_BLIMP_CLIENT_SESSION_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
@@ -35,4 +35,4 @@ class BlimpClientSessionAndroid : public BlimpClientSession {
 }  // namespace client
 }  // namespace blimp
 
-#endif  // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_ANDROID_H_
+#endif  // BLIMP_CLIENT_APP_ANDROID_BLIMP_CLIENT_SESSION_ANDROID_H_