Update Native OMX patches

Cherrypicking like tihs till i put everything in 1 commit after testing