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