merge from open-source master

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