Merge "Use err() instead of error() in mkbootfs" am: 6f2dab0ba7 am: 20f0f49b0d am: 0aeca7c783

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

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