Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread