Merge "mkbootfs: consistency." am: beeef8c01a

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

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