Addressed NDK API feedback

Test: Builds
Bug: 330375394
Change-Id: I9d3746821a792ef163b4225a5477c974ef9e698d
2 files changed