Merge "aidl: Improve Effect VTS naming"