Merge change 1099 into donut

* changes:
  Fix Phone-based locale selection to never choose a lang-only locale.
tree: 4944927123cae9802b2dc08962144db681a31c83
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE