Merge "MediaPLayer: remove unused code" into qt-dev
am: 1b62363005

Change-Id: Ib9f078319d03a3b176a17837a575a08f1c1e6bb8