Refresh OProfile code running on the target side to 0.9.5 for ARMV7.
diff --git a/libop/op_config.h b/libop/op_config.h
index b384497..12e4b96 100644
--- a/libop/op_config.h
+++ b/libop/op_config.h
@@ -25,6 +25,10 @@
  */
 void init_op_config_dirs(char const * session_dir);
 
+#ifndef ANDROID
+#define OP_SESSION_DIR_DEFAULT "/var/lib/oprofile/"
+#endif
+
 /* 
  * various paths, corresponding to opcontrol, that should be
  * initialized by init_op_config_dirs() above. 
@@ -37,8 +41,10 @@
 extern char op_pipe_file[];
 extern char op_dump_status[];
 
+#if ANDROID
 #define OP_DRIVER_BASE  "/dev/oprofile"
 #define OP_DATA_DIR     "/data/oprofile"
+#endif
 
 /* Global directory that stores debug files */
 #ifndef DEBUGDIR