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