Merge "Allow AVF C++ demo to use libbinder_rpc" am: 8e3f7c16 am: 754995e7...

Merge "Allow AVF C++ demo to use libbinder_rpc" am: 8e3f7c16 am: 754995e7 am: 90f87088 am: 078615d9

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



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