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

Change-Id: I0a83d4b11ebbb2541c7e6e2fb4118617f40a1379