am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread

Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp

* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
  Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
tree: 340fd639cd8c487e65c47e4d44ee66974d8a9b85
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/