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

Change-Id: I550d6ce82513fc8e160597ba2ff89b6c5efa286a