Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I00857704362cdf8e71abb2c2d45dc72e54639d84
29 files changed