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

Change-Id: I0b7672f7e352944b3c8fae06d9c4d05feb8d91db