[rbp/omxplayer] sync up with dvdplayer master changes