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

Change-Id: I8a61792c1dafd6c7320e19e53d8b89f4942f3698