Merge "dalvik: use proper nativehelper headers" am: dfdc080699 am: 7d323ac8b2
am: e72c034e61

Change-Id: I68d8a21f6b8d77c3b41b290a737d33ed238745c1