Revert of Remove "keyboard" from keyboard strings. (https://codereview.chromium.org/175513004/)

Reason for revert:
Cause unit_tests to fail:
  GetInputMethodLongNameTest
  TestGetInputMethodDisplayNameFromId

http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/40772/steps/unit_tests/logs/stdio

E.g.:

InputMethodUtilTest.GetInputMethodLongNameTest (run #1):
[ RUN      ] InputMethodUtilTest.GetInputMethodLongNameTest
../../chrome/browser/chromeos/input_method/input_method_util_unittest.cc:246: Failure
Value of: util_.GetInputMethodLongName(desc)
  Actual: Japanese
Expected: ASCIIToUTF16("Japanese keyboard")
Which is: Japanese keyboard
../../chrome/browser/chromeos/input_method/input_method_util_unittest.cc:252: Failure
Value of: util_.GetInputMethodLongName(desc)
  Actual: US Dvorak
Expected: ASCIIToUTF16("US Dvorak keyboard")
Which is: US Dvorak keyboard

Original issue's description:
> Remove "keyboard" from keyboard strings.
> 
> BUG=344555
> TEST=manual
> NOTRY=true
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256871

TBR=nkostylev@chromium.org,alemate@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=344555

Review URL: https://codereview.chromium.org/196253004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256916 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 256916