Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I78092318110a6916e07a5213e3584bf04ddd954c
56 files changed