Merge "Allow AVF C++ demo to use libbinder_rpc" am: 8e3f7c16d8 am: 754995e7cf am: 90f87088f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2583731

Change-Id: I30e65b0229f8e311a90086c1cc87803ccc2a3732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>