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

Change-Id: Ibddc7b339d8cba53c73b2471bab11eabca82fa33