Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: Ic8ab6603b6eeafc8eab3f0a7a3dc374119a17d64
62 files changed