Merge "Adjust path to sdv_ivi_cf" into udc-qpr-dev-plus-aosp