Merge java_staging/src into java/src.

WATCHLISTS

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Watchlist Rules
 # Refer: http://dev.chromium.org/developers/contributing-code/watchlists
 
 # IMPORTANT: The regular expression filepath is tested against each path using
 # re.search, so it is not usually necessary to add .*.
 
@@ skipping 252 matching lines @@
     },
     'cookie_monster': {
       'filepath': 'net/cookies/|'\
                   'chrome/browser/net/sqlite_persistent_cookie_store',
     },
     'custom_handlers': {
       'filepath': 'chrome/browser/custom_handlers/|'\
                   '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': {
       'filepath': 'tools/(deep_memory_profiler|find_runtime_symbols)',
     },
     'device_bluetooth': {
       'filepath': 'device/.*bluetooth'
     },
     'device_sensors': {
       'filepath': 'content/browser/device_sensors/|'\
@@ skipping 47 matching lines @@
                   'content/renderer/media/crypto/|' \
                   'media/base/android/*drm*|' \
                   'media/cdm/|' \
                   'third_party/widevine/cdm/'
     },
     'enhanced_bookmarks': {
       'filepath': 'chrome/browser/enhanced_bookmarks/' \
                   '|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'
     },
     'events': {
       'filepath': 'ui/events/',
     },
     'extension': {
       'filepath': 'extension',
     },
     'fileapi': {
@@ skipping 794 matching lines @@
                              'tnakamura+watch@chromium.org'],
     'website_settings': ['markusheintz@chromium.org'],
     'windows_sandboxing': ['wfh+watch@chromium.org'],
     'worker': ['jam@chromium.org'],
     'x11': ['derat+watch@chromium.org',
             'sadrul@chromium.org',
             'yusukes+watch@chromium.org'],
     'zoom': ['wjmaclean@chromium.org'],
   },
 }