Merge "Testing AIDL delegator class with RPC"