Rename language+country resources to just language

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