resolved conflicts for merge of 598b87c2 to lmp-mr1-dev-plus-aosp

Change-Id: If652f7e81a2589647a7d0d697b2130f8bf32c513

tools/sepolicy-analyze/sepolicy-analyze.c

@@ -40,7 +40,9 @@ int main(int argc, char **argv)
     char *policy;
     struct policy_file pf;
     policydb_t policydb;
-    int rc, i;
+    int rc;
+    int i;
+
     if (argc < 3)
         usage(argv[0]);
     policy = argv[1];
@@ -55,7 +57,5 @@ int main(int argc, char **argv)
         }
     }
     usage(argv[0]);
-
-    // will never be called due to exit() call in usage
-    exit(1);
+    exit(0);
 }