Merge "Fix package equivalence tests" into r-keystone-qcom-dev