Clean up query and test files

java/ql/src/semmle/code/java/dataflow/FlowSteps.qll

@@ -4,7 +4,6 @@
 
 private import java
 private import semmle.code.java.dataflow.DataFlow
-private import semmle.code.java.dataflow.FlowSources
 
 /**
  * A module importing the frameworks that implement additional flow steps,

java/ql/src/semmle/code/java/frameworks/android/Android.qll

@@ -34,11 +34,16 @@ class AndroidComponent extends Class {
  * An Android component that can be explicitly or implicitly exported.
  */
 class ExportableAndroidComponent extends AndroidComponent {
-  /** Holds if this Android component is configured as `exported` or has intent filters configured without `exported` explicitly disabled in an `AndroidManifest.xml` file. */
+  /**
+   * Holds if this Android component is configured as `exported` or has intent
+   * filters configured without `exported` explicitly disabled in an
+   * `AndroidManifest.xml` file.
+   */
   override predicate isExported() {
     getAndroidComponentXmlElement().isExported()
     or
-    not getAndroidComponentXmlElement().isNotExported() and hasIntentFilter()
+    hasIntentFilter() and
+    not getAndroidComponentXmlElement().isNotExported()
   }
 }
 

java/ql/src/semmle/code/java/frameworks/android/Intent.qll

@@ -50,4 +50,4 @@ class BundleGetterMethods extends Method, TaintPreservingCallable {
   }
 
   override predicate returnsTaintFrom(int arg) { arg = -1 }
-}
+}