merge from open-source master

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