Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I258030ee680426b667e52cbb1e8b7026cbe4566b
38 files changed