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

Change-Id: I70b6caa3ef16467e4f1411363166fe94d3fbe9cd