Merge "Stop using the non-uapi <linux/err.h> header file."