Snap for 6183524 from 8a80c9e0823f1252955446db388d3ccc66b7f0ca to r-keystone-qcom-release

Change-Id: I686577433334cbdf64105a44ab18b9854e1a5895
diff --git a/Android.bp b/Android.bp
index 2ebdd16..f6edaa0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,7 @@
         "-DHAVE_CONFIG_H",
         "-DANOTHER_BRICK_IN_THE",
         "-DSYSCONFDIR=\"/tmp\"",
+        "-UNDEBUG",
     ],
     target: {
         linux_glibc: {
diff --git a/port-gnu/config.h b/port-gnu/config.h
index eb4ce84..29c216e 100644
--- a/port-gnu/config.h
+++ b/port-gnu/config.h
@@ -10,6 +10,9 @@
 /* System logging. */
 #define ENABLE_LOGGING 1
 
+/* Enable openssl for modinfo. */
+/* #undef ENABLE_OPENSSL */
+
 /* Enable Xz for modules. */
 /* #undef ENABLE_XZ */
 
@@ -92,10 +95,9 @@
 #define HAVE___XSTAT 1
 
 /* Features in this build */
-#define KMOD_FEATURES "-XZ -ZLIB -EXPERIMENTAL"
+#define KMOD_FEATURES "-XZ -ZLIB -OPENSSL -EXPERIMENTAL"
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
 /* Name of package */
@@ -108,7 +110,7 @@
 #define PACKAGE_NAME "kmod"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "kmod 23"
+#define PACKAGE_STRING "kmod 26"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "kmod"
@@ -117,7 +119,7 @@
 #define PACKAGE_URL "http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "23"
+#define PACKAGE_VERSION "26"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -145,7 +147,7 @@
 
 
 /* Version number of package */
-#define VERSION "23"
+#define VERSION "26"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE