Get rid of identical hardware/qcom/media

Change-Id: I7bda4c5ed0f74b53b5cce2e86d7faeb07a66cfb4
My Repo Changes

Change-Id: I382c5b0dd3ddc652c1df815f0871dc8ba083aadd