Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I4a83d7c286cc14b1d49ee864954f397b12d74145
16 files changed