Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master