merge from open-source master

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