Merge "dalvikvm.cc: use proper nativehelper headers"