Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: Ic3806a7685fa6ae6cb397d6bc4a00812fa734709
30 files changed