Revert local copy of qcom/media. All commits are merged now

Change-Id: Ia6c02d7feafd1cb4ead2c0cf2145f73bc00dc1f4