Merge "Remove OMX dependency from MediaPlayerService"