Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: Ia296ffe335fb523c2ebc5504c6dbe33498c306b0
21 files changed