Merge "media: add support to pick target specific xml" into r-keystone-qcom-dev