Put hw/qcom/{display,media} back to aosp paths

Change-Id: I431e473e6e14af609b5577fc8c592e6f7c18e2f7