Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944 am: 81972a18e4 am: 795bcc5b75
am: c64c642e14

Change-Id: I7815db015b05c148ec7b62783a4843e0a4c04e90