Organize lib targets

Order them lexicographically. Move junit and its private dependency
hamcrest into a subpackage.

Change-Id: I059541885144981a3ab9f605492243da71bba2d0

gitiles-servlet/BUCK

diff --git a/gitiles-servlet/BUCK b/gitiles-servlet/BUCK
index 4fa89ab..9fdacae 100644
--- a/gitiles-servlet/BUCK
+++ b/gitiles-servlet/BUCK
@@ -31,11 +31,11 @@
   name = 'servlet_tests',
   srcs = glob(['src/test/java/**/*.java']),
   deps = DEPS_ALL + [
-    '//lib/jgit:junit',
-    '//lib:junit',
+    ':servlet',
     # Gitiles is designed to compile against the Servlet API v2.5.
     '//lib:servlet-api_2_5',
-    ':servlet',
+    '//lib/jgit:junit',
+    '//lib/junit:junit',
   ],
   visibility = ['//:classpath'],
 )