Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I79a1dfaf0b5835b8dee022f36f0dbce2d726e246
30 files changed