Merge from honeycomb-plus-aosp

Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
tree: 7bf57adeda6dc0496cc01599d824b79abafe52a9
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE