Merge "Skip get target SDK for VNDK client on aidl" into udc-qpr-dev