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