Merge "com.android.server: use proper nativehelper headers"
am: 41a7f5a64f  -s ours

Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567