Rename language+country resources to just language

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