Restructure contents of blimp/client.

blimp/client/android/java/strings/android_blimp_strings.grd

Index: blimp/client/android/java/strings/android_blimp_strings.grd
diff --git a/blimp/client/android/java/strings/android_blimp_strings.grd b/blimp/client/android/java/strings/android_blimp_strings.grd
deleted file mode 100644
index c245fe4473ab15af5e3a47ac548729cfddb26181..0000000000000000000000000000000000000000
--- a/blimp/client/android/java/strings/android_blimp_strings.grd
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit current_release="1" latest_public_release="0">
-  <outputs>
-    <output filename="values-am/android_blimp_strings.xml" lang="am" type="android" />
-    <output filename="values-ar/android_blimp_strings.xml" lang="ar" type="android" />
-    <output filename="values-bg/android_blimp_strings.xml" lang="bg" type="android" />
-    <output filename="values-ca/android_blimp_strings.xml" lang="ca" type="android" />
-    <output filename="values-cs/android_blimp_strings.xml" lang="cs" type="android" />
-    <output filename="values-da/android_blimp_strings.xml" lang="da" type="android" />
-    <output filename="values-de/android_blimp_strings.xml" lang="de" type="android" />
-    <output filename="values-el/android_blimp_strings.xml" lang="el" type="android" />
-    <output filename="values/android_blimp_strings.xml" lang="en" type="android" />
-    <output filename="values-en-rGB/android_blimp_strings.xml" lang="en-GB" type="android" />
-    <output filename="values-es/android_blimp_strings.xml" lang="es" type="android" />
-    <output filename="values-es-rUS/android_blimp_strings.xml" lang="es-419" type="android" />
-    <output filename="values-fa/android_blimp_strings.xml" lang="fa" type="android" />
-    <output filename="values-fi/android_blimp_strings.xml" lang="fi" type="android" />
-    <output filename="values-tl/android_blimp_strings.xml" lang="fil" type="android" />
-    <output filename="values-fr/android_blimp_strings.xml" lang="fr" type="android" />
-    <output filename="values-hi/android_blimp_strings.xml" lang="hi" type="android" />
-    <output filename="values-hr/android_blimp_strings.xml" lang="hr" type="android" />
-    <output filename="values-hu/android_blimp_strings.xml" lang="hu" type="android" />
-    <output filename="values-in/android_blimp_strings.xml" lang="id" type="android" />
-    <output filename="values-it/android_blimp_strings.xml" lang="it" type="android" />
-    <output filename="values-iw/android_blimp_strings.xml" lang="iw" type="android" />
-    <output filename="values-ja/android_blimp_strings.xml" lang="ja" type="android" />
-    <output filename="values-ko/android_blimp_strings.xml" lang="ko" type="android" />
-    <output filename="values-lt/android_blimp_strings.xml" lang="lt" type="android" />
-    <output filename="values-lv/android_blimp_strings.xml" lang="lv" type="android" />
-    <output filename="values-nl/android_blimp_strings.xml" lang="nl" type="android" />
-    <output filename="values-nb/android_blimp_strings.xml" lang="no" type="android" />
-    <output filename="values-pl/android_blimp_strings.xml" lang="pl" type="android" />
-    <output filename="values-pt-rBR/android_blimp_strings.xml" lang="pt-BR" type="android" />
-    <output filename="values-pt-rPT/android_blimp_strings.xml" lang="pt-PT" type="android" />
-    <output filename="values-ro/android_blimp_strings.xml" lang="ro" type="android" />
-    <output filename="values-ru/android_blimp_strings.xml" lang="ru" type="android" />
-    <output filename="values-sk/android_blimp_strings.xml" lang="sk" type="android" />
-    <output filename="values-sl/android_blimp_strings.xml" lang="sl" type="android" />
-    <output filename="values-sr/android_blimp_strings.xml" lang="sr" type="android" />
-    <output filename="values-sv/android_blimp_strings.xml" lang="sv" type="android" />
-    <output filename="values-sw/android_blimp_strings.xml" lang="sw" type="android" />
-    <output filename="values-th/android_blimp_strings.xml" lang="th" type="android" />
-    <output filename="values-tr/android_blimp_strings.xml" lang="tr" type="android" />
-    <output filename="values-uk/android_blimp_strings.xml" lang="uk" type="android" />
-    <output filename="values-vi/android_blimp_strings.xml" lang="vi" type="android" />
-    <output filename="values-zh-rCN/android_blimp_strings.xml" lang="zh-CN" type="android" />
-    <output filename="values-zh-rTW/android_blimp_strings.xml" lang="zh-TW" type="android" />
-  </outputs>
-  <translations>
-    <file lang="am" path="translations/android_blimp_strings_am.xtb" />
-    <file lang="ar" path="translations/android_blimp_strings_ar.xtb" />
-    <file lang="bg" path="translations/android_blimp_strings_bg.xtb" />
-    <file lang="ca" path="translations/android_blimp_strings_ca.xtb" />
-    <file lang="cs" path="translations/android_blimp_strings_cs.xtb" />
-    <file lang="da" path="translations/android_blimp_strings_da.xtb" />
-    <file lang="de" path="translations/android_blimp_strings_de.xtb" />
-    <file lang="el" path="translations/android_blimp_strings_el.xtb" />
-    <file lang="en-GB" path="translations/android_blimp_strings_en-GB.xtb" />
-    <file lang="es" path="translations/android_blimp_strings_es.xtb" />
-    <file lang="es-419" path="translations/android_blimp_strings_es-419.xtb" />
-    <file lang="fa" path="translations/android_blimp_strings_fa.xtb" />
-    <file lang="fi" path="translations/android_blimp_strings_fi.xtb" />
-    <file lang="fil" path="translations/android_blimp_strings_fil.xtb" />
-    <file lang="fr" path="translations/android_blimp_strings_fr.xtb" />
-    <file lang="hi" path="translations/android_blimp_strings_hi.xtb" />
-    <file lang="hr" path="translations/android_blimp_strings_hr.xtb" />
-    <file lang="hu" path="translations/android_blimp_strings_hu.xtb" />
-    <file lang="id" path="translations/android_blimp_strings_id.xtb" />
-    <file lang="it" path="translations/android_blimp_strings_it.xtb" />
-    <file lang="iw" path="translations/android_blimp_strings_iw.xtb" />
-    <file lang="ja" path="translations/android_blimp_strings_ja.xtb" />
-    <file lang="ko" path="translations/android_blimp_strings_ko.xtb" />
-    <file lang="lt" path="translations/android_blimp_strings_lt.xtb" />
-    <file lang="lv" path="translations/android_blimp_strings_lv.xtb" />
-    <file lang="nl" path="translations/android_blimp_strings_nl.xtb" />
-    <file lang="no" path="translations/android_blimp_strings_no.xtb" />
-    <file lang="pl" path="translations/android_blimp_strings_pl.xtb" />
-    <file lang="pt-BR" path="translations/android_blimp_strings_pt-BR.xtb" />
-    <file lang="pt-PT" path="translations/android_blimp_strings_pt-PT.xtb" />
-    <file lang="ro" path="translations/android_blimp_strings_ro.xtb" />
-    <file lang="ru" path="translations/android_blimp_strings_ru.xtb" />
-    <file lang="sk" path="translations/android_blimp_strings_sk.xtb" />
-    <file lang="sl" path="translations/android_blimp_strings_sl.xtb" />
-    <file lang="sr" path="translations/android_blimp_strings_sr.xtb" />
-    <file lang="sv" path="translations/android_blimp_strings_sv.xtb" />
-    <file lang="sw" path="translations/android_blimp_strings_sw.xtb" />
-    <file lang="th" path="translations/android_blimp_strings_th.xtb" />
-    <file lang="tr" path="translations/android_blimp_strings_tr.xtb" />
-    <file lang="uk" path="translations/android_blimp_strings_uk.xtb" />
-    <file lang="vi" path="translations/android_blimp_strings_vi.xtb" />
-    <file lang="zh-CN" path="translations/android_blimp_strings_zh-CN.xtb" />
-    <file lang="zh-TW" path="translations/android_blimp_strings_zh-TW.xtb" />
-  </translations>
-  <release allow_pseudo="false" seq="1">
-    <messages fallback_to_english="true">
-      <!-- NOTE: Please add translateable="false" to all strings for now. -->
-      <message name="IDS_SIGNIN_GET_TOKEN_FAILED" desc="Message for when authenticating a user failed.">
-        Unable to authenticate user.
-      </message>
-      <message name="IDS_SIGNIN_GET_TOKEN_SUCCEEDED" desc="Message for when authenticating user was successful.">
-        Token retrieved.
-      </message>
-      <message name="IDS_SIGNIN_CHOOSER_DESCRIPTION" desc="Message shown with the Android signin chooser screen.">
-        Please choose an account to use with Blimp.
-      </message>
-    </messages>
-  </release>
-</grit>