Merge de99450655a34f355b7c24cdb2337c0b084b75e8 on remote branch

Change-Id: I155ee19739ffc2b9c7128360cdd2872ddb0e0944
diff --git a/oem-recovery/Android.bp b/oem-recovery/Android.bp
index 41cd359..a014b47 100644
--- a/oem-recovery/Android.bp
+++ b/oem-recovery/Android.bp
@@ -8,7 +8,7 @@
 
 soong_config_string_variable {
     name: "ufsframework",
-    values: ["sg", "bsg"],
+    values: ["sg", "bsg", "non_ufs"],
 }
 
 ufsbsg_cc_defaults {
@@ -18,6 +18,10 @@
             bsg : {
                cflags : ["-D_BSG_FRAMEWORK_KERNEL_HEADERS"],
             },
+//support compilation for non-ufs config
+           non_ufs : {
+              cflags : ["-D_GENERIC_KERNEL_HEADERS"],
+           },
         },
      },
 }