mkbootimg changes for bootconfig am: 808d42e197

Original change: https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1580903

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dd66a5153e84b254cd93bac7b0070ea480f11cd