clean up Qcom/Media

Change-Id: I4ed65e21f66d2b0bee56c97dd7c35868c8e11710