Merge "mediaplayer2: remove redundant line" into pi-dev