Merge "Move libraries from overriding" into rvc-d1-dev-plus-aosp am: c31510fb79

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/12977834

Change-Id: Iabb585a3281ac9d793878b8111c224c70d5fbd16