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