Merge "Remove redunant aidl api" into rvc-dev