Merge "Fix "implicit declaration of function 'strerror'"."