Update some prebuilts.

tools/base @ 2f7c8987fd248f96fdc8a2ccdad72e42d9866b68

Also include updated manifest-merger.jar since it was not
updated after 3d3d7bc8fa39679b1a64d0663530db71ae41da70

Change-Id: I0797356c081527d0b60d4560b1fc3e4a6122e4b2
diff --git a/tools/lib/ant-tasks.jar b/tools/lib/ant-tasks.jar
index 027f353..4f47222 100644
--- a/tools/lib/ant-tasks.jar
+++ b/tools/lib/ant-tasks.jar
Binary files differ
diff --git a/tools/lib/manifest-merger.jar b/tools/lib/manifest-merger.jar
index be3a4dd..e3cce5f 100644
--- a/tools/lib/manifest-merger.jar
+++ b/tools/lib/manifest-merger.jar
Binary files differ
diff --git a/tools/lib/sdklib.jar b/tools/lib/sdklib.jar
index dbb2d48..5013c8c 100644
--- a/tools/lib/sdklib.jar
+++ b/tools/lib/sdklib.jar
Binary files differ