merge from open-source master

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