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