[Berberis] Code clean up am: 00675ce72b am: 49116642d6

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

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