Merge "Remove legacy omx_message variables"