Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: Ic9c49ce5df386d7e2a81991adb137c7525aa77d4
33 files changed