Android security 8.1.0 release 87
Rename language+country resources to just language

Bug: 26496609
Test: none
Change-Id: I483cbdef4f29f1562395755f543bdd00aa7ca405
44 files changed