Merge "Revert "OMX: Add 64bit consumer usage flag parameter"" into main