Merge "Fix error handling in Treble OMX wrappers."