Merge "Tighten native API surface." am: d2c4eb0dae
am: 5f920a0a57

Change-Id: I905d0e33099761a637c94b0d998199a71cdeae7c