Rename language+country resources to just language Bug: 26496609 Test: none Change-Id: If207feadf03c2cbd868ecc4093618740f3c5751d