Reconcile with gingerbread-mr4-release

Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a
tree: c682b032f0feed1418267ef8efe897589d4900bd
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE