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

Change-Id: I7c9565dd32f2a9a651ed0882d721bcf799f860e1