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