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

Change-Id: Ibf8fe0061d020da9045357cde02592a874161285