fork cm's qcom/media

Change-Id: I7cfd8b9217c29a8dda45ae8e453ee6a9ba358c2b