Merge "dalvik: use proper nativehelper headers"
am: dfdc080699

Change-Id: Ic80e5a310d49c406723a523c5cbafbe4039576f4