Merge "Remove MediaPlayer2 from media apex." into qt-dev
am: 2cb1a8ccbd

Change-Id: Id38edffcab8254816a742341b53918ac17bf2c11