Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I0c6bbf6f487ad1117dd8dfae11fb0a8534ccaec4
32 files changed