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