Rename language+country resources to just language

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