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

Change-Id: I248543aae3caa6300daca885e317fb4e5877c088