[automerger skipped] Move libraries from overriding am: 426589036d am: afd617466e -s ours am: 1b4e2e3a32 -s ours

am skip reason: Change-Id I1fe74549084b0959839a98afe4e186d153f7a25c with SHA-1 31b340fb8e is in history

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

Change-Id: I23b0226deee887794f1cc531130820867a662573