Handle any null pointer exceptions that might occur when looking for AppleSDKs

Author: shs96c

src/com/facebook/buck/apple/toolchain/impl/AppleSdkDiscovery.java

@@ -251,7 +251,7 @@ private static boolean buildSdkFromPath(
         sdkBuilder.addAllArchitectures(architectures);
         return true;
       }
-    } catch (NoSuchFileException e) {
+    } catch (NoSuchFileException | NullPointerException e) {
       LOG.warn(e, "Skipping SDK at path %s, no SDKSettings.plist found", sdkDir);
       return false;
     }

src/com/facebook/buck/jvm/java/BUCK

@@ -331,11 +331,7 @@ java_library_with_plugins(
         "JavaLibraryDescription.java",
         "JavaLibraryRules.java",
         "JavaLibraryWithTests.java",
-<<<<<<< HEAD
-=======
         "JavaPluginDescription.java",
-        "JavaSourceJar.java",
->>>>>>> fb/master
         "JavaTest.java",
         "JavaTestDescription.java",
         "JavacFactory.java",
@@ -350,11 +346,8 @@ java_library_with_plugins(
         "MaybeRequiredForSourceOnlyAbiArg.java",
         "PrebuiltJar.java",
         "PrebuiltJarDescription.java",
-<<<<<<< HEAD
         "SourceJar.java",
-=======
         "StandardJavacPlugin.java",
->>>>>>> fb/master
         "UnusedDependenciesFinderFactory.java",
         "ZipArchiveDependencySupplier.java",
     ],