Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I17eff558d32269536d65d166bad835a49ead1f95
30 files changed