Merge "move MediaPlayer from CES2017"