Merge "vendor: add sm8150/msmnile to qcom targets" into android-9.0