Merge "Freeze vintf aidl interfaces" into rvc-dev