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

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

Change-Id: I081cc3b4e36cacfdbc4c8f4373c0ace8295a6f3f