Merge "Allow AVF C++ demo to use libbinder_rpc"