Merge "Fix an incorrect NDK function prototype."