resolved conflicts for merge of 3a1eb33b to lmp-mr1-dev-plus-aosp

Change-Id: I5cdc157157b6ed382e4827406bce7406fc2c3e3a

tools/README

@@ -50,4 +50,4 @@ sepolicy-check
 
 sepolicy-analyze
     A tool for performing various kinds of analysis on a sepolicy
-    file.
\ No newline at end of file
+    file.

tools/sepolicy-analyze/typecmp.c

@@ -281,6 +281,12 @@ int typecmp_func (int argc, char **argv, policydb_t *policydb) {
         case 'e':
             equiv = 1;
             break;
+        case 'w':
+            warn = 1;
+            break;
+        case 'z':
+            debug = 1;
+            break;
         default:
             USAGE_ERROR = true;
             return -1;