Reconcile with gingerbread-release gingerbread-mr4-release

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