merge from open-source master

Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244
tree: f870ef423619df811c8f1d8553b158472508244b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE