Reverts commits 4567e40eb0 and a977707d6e, which added special case fallbacks for game controllers in the Japanese locale. Bug: 12923922 Change-Id: I229126e589e11fb5de86772ef9c59d09723af941
4567e40eb0
a977707d6e