Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am: 7d7c269944
am: 81972a18e4

Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0