Fix possible NPE reading dep file.
Fix this by using guava Files instead.
Also fixes sdklib's manifest.
Change-Id: I5dd4123f389ce1bd8c900933021fc2179e6caa3b
diff --git a/build/tools.atree b/build/tools.atree
index f466d70..adb666c 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -110,7 +110,7 @@
framework/sdkmanager.jar tools/lib/sdkmanager.jar
framework/monkeyrunner.jar tools/lib/monkeyrunner.jar
framework/chimpchat.jar tools/lib/chimpchat.jar
-framework/guavalib.jar tools/lib/guavalib.jar
+framework/guava-tools.jar tools/lib/guava-tools.jar
framework/jsilver.jar tools/lib/jsilver.jar
framework/jython.jar tools/lib/jython.jar
framework/mkidentity-prebuilt.jar tools/lib/mkidentity.jar