Merge "dalvik: use proper nativehelper headers"