Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am: 7d7c269944

Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d