Reconcile gingerbread-plus-aosp and honeycomb

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