Rename language+country resources to just language

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