Merge "Tidy-up a few dependencies in NativeCode.bp" into sc-dev am: e0c988c8f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/14678280

Change-Id: I1a81c2618be926dc5b504128eda89fcac2adb0ee