Merge "Use err() instead of error() in mkbootfs"