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

Change-Id: I6ef4e3b5c44272f5f0a8d585afea15a901178d2a