SDK: Enable tests for manifest-merger.

Change-Id: I48f74d5d3ff5237388915cb3823be5168903d417
diff --git a/build/tools.atree b/build/tools.atree
index 8ff0554..bfe1cb1 100644
--- a/build/tools.atree
+++ b/build/tools.atree
@@ -151,10 +151,13 @@
 # Tests Component
 ##############################################################################
 
-sdk/testapps            tests/testapps
-framework/ddmlib-tests.jar tests/libtests/ddmlib-tests.jar
-framework/ninepatch-tests.jar tests/libtests/ninepatch-tests.jar
-framework/common-tests.jar tests/libtests/common-tests.jar
-framework/sdklib-tests.jar tests/libtests/sdklib-tests.jar
-framework/sdkuilib-tests.jar tests/libtests/sdkuilib-tests.jar
-framework/layoutlib_api.jar tests/libtests/layoutlib_api.jar
+sdk/testapps                      tests/testapps
+framework/ddmlib-tests.jar        tests/libtests/ddmlib-tests.jar
+framework/ninepatch-tests.jar     tests/libtests/ninepatch-tests.jar
+framework/common-tests.jar        tests/libtests/common-tests.jar
+framework/sdklib-tests.jar        tests/libtests/sdklib-tests.jar
+framework/sdkuilib-tests.jar      tests/libtests/sdkuilib-tests.jar
+framework/layoutlib_api.jar       tests/libtests/layoutlib_api.jar
+framework/manifmerger.jar         tests/libtests/manifmerger.jar
+framework/manifmerger-tests.jar   tests/libtests/manifmerger-tests.jar
+