am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead...
am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d' into gingerbread-plus-aosp
* commit 'b04f356d':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.