upkeep to qcom/media - thanksCM

Change-Id: Id59b4afe68e79fd8748591f64e044eae8927cc3e