merge from open-source master

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