Rename language+country resources to just language Bug: 26496609 Test: none Change-Id: I2f61742c8c268eb2df28357f1a21ff1ddcfd6b69