Tighten native API surface. am: 79f5662900 am: 39123efefc
am: f4fef41c2f

Change-Id: Ia107d2dd0a4de61b651f9422fb56cb5f3c0dff85