Merge "Extend OpenMAX IL definitions to support AC3"