Merge "Allow AVF C++ demo to use libbinder_rpc" am: 8e3f7c16d8

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

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