Merge "art: use proper nativehelper headers" am: c5b1b067fb
am: 78a95b7e12

Change-Id: Id9e040c6c688e01627d743c0e8739386f74bda3d