Rename language+country resources to just language

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