Merge "Use err() instead of error() in mkbootfs" am: 6f2dab0b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2381332



Change-Id: I4dfb555445a2f300c0de6f06486878452ddd8785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>