Merge "target: msm8952: rename hardware subtypes to sap"