Android 8.1.0 Release 40 (OPM4.171019.021.R1)
Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: Id6a80a70c20cb3098bac504ce65e6f09d7bc137b
28 files changed