Merge java_staging/src into java/src.

WATCHLISTS

Index: WATCHLISTS
diff --git a/WATCHLISTS b/WATCHLISTS
index 7badf18dee47811bf94db541c948feb2a0244d18..0eb52a0a49ab2164e5ab1f2d14b80205aefc371e 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -270,7 +270,7 @@
                   'chrome/common/custom_handlers/',
     },
     'custom_tabs': {
-      'filepath': 'chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/|'\
+      'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/customtabs/|'\
                   'chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/',
     },
     'deep_memory_profiler': {
@@ -338,7 +338,7 @@
                   '|components/enhanced_bookmarks/'
     },
     'enhanced_bookmarks_android': {
-      'filepath': 'chrome/android/java_staging/src/org/chromium/'\
+      'filepath': 'chrome/android/java/src/org/chromium/'\
                     'chrome/browser/enhancedbookmarks/|'\
                   'chrome/android/java/res/layout/eb*.xml'
     },