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

Change-Id: Ibb06b2c433b5a26d6d8ad280a7e744cce130b2ae