Merge "Add AC-4 support in OpenMAX definition"