Merge "Make mkbootfs self-contained" am: 4f8a56f15d

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

Change-Id: If2264860a48b2c5e240808eccace000a30689952