Merge "libcore: use proper nativehelper headers" am: 30c78a3848 am: 85ddfe1683 am: 6dd847032b
am: 45fd0728d4

Change-Id: I8441ac042299035d253a3e6235921f838f45d9f9