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

Change-Id: I058c1f7b810fcbedbc7f5318f96fd6e2e6194162