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

Change-Id: I72660d80e67d27ae0706321517c1596e9ecef630