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: I5d61bc6ebd2163e0f6b94f8e1d50e5fbdc85b4ae