Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f  -s ours am: 79e124c9c7  -s ours am: 0666e1cd5c  -s ours
am: 4033c5e1b7  -s ours

Change-Id: I0123c124dcd6f0b74af3c6c57783e318c0892323