Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"