[rbp/omxplayer] Apply latest commits from dvdplayer to omxplayer

This picks up any changes to dvdplayer that haven't been applied to omxplayer.
This makes the diffs between omxplayer and dvdplayer pretty minimal.