Merge "dalvikvm.cc: use proper nativehelper headers" am: 1b1cac278a
am: 071672aa23

Change-Id: If6a7f7ea879c140c0a9ecc628bdaa7a6fffeb9f8