Tighten native API surface.
am: 79f5662900

Change-Id: Ibf125fa01d87f9f6331de519e2555bd50aa82165