merge from open-source master

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