Move Android metrics files into a /metrics/ subfolder/package.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3bfc0fd775cb7152baa566a2e55470266c0ca039..67a87441c080b135879a582871042444192fb493 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -101,8 +101,12 @@
       'browser/android/logo_service.h',
       'browser/android/manifest_icon_selector.cc',
       'browser/android/manifest_icon_selector.h',
+      'browser/android/metrics/uma_bridge.cc',
+      'browser/android/metrics/uma_bridge.h',
       'browser/android/metrics/uma_session_stats.cc',
       'browser/android/metrics/uma_session_stats.h',
+      'browser/android/metrics/uma_utils.cc',
+      'browser/android/metrics/uma_utils.h',
       'browser/android/most_visited_sites.cc',
       'browser/android/most_visited_sites.h',
       'browser/android/new_tab_page_prefs.cc',
@@ -156,10 +160,6 @@
       'browser/android/thumbnail/thumbnail.h',
       'browser/android/thumbnail/thumbnail_store.cc',
       'browser/android/thumbnail/thumbnail_store.h',
-      'browser/android/uma_bridge.cc',
-      'browser/android/uma_bridge.h',
-      'browser/android/uma_utils.cc',
-      'browser/android/uma_utils.h',
       'browser/android/url_utilities.cc',
       'browser/android/url_utilities.h',
       'browser/android/voice_search_tab_helper.cc',
@@ -1601,7 +1601,9 @@
       'android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java',
       'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
       'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
+      'android/java/src/org/chromium/chrome/browser/metrics/UmaBridge.java',
       'android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java',
+      'android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java',
       'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
       'android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java',
       'android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java',
@@ -1634,8 +1636,6 @@
       'android/java/src/org/chromium/chrome/browser/Tab.java',
       'android/java/src/org/chromium/chrome/browser/TabState.java',
       'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java',
-      'android/java/src/org/chromium/chrome/browser/UmaBridge.java',
-      'android/java/src/org/chromium/chrome/browser/UmaUtils.java',
       'android/java/src/org/chromium/chrome/browser/UrlUtilities.java',
       'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java',
       'android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java',