Android O MR1 Preview 2 (OPP6.171019.012)
Rename language+country resources to just language

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