merge from open-source master

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