Merge change I7a57637b into eclair

* changes:
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
tree: 234f98534f0ab077f554328f0da12d174568c080
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE