[rbp/omxplayer] More OMX fixes and cleanups

Another set of fixes. Again should be no obvious change in behaviour, but some of the fixes are required for future changes.