[Berberis] Code clean up am: 00675ce72b

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

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