Merge "Update retrofit_gki.sh for new init_boot plan" am: ac75382f8b am: 7782ab502d

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

Change-Id: I606e4a3050556bdd2302fdeaff2b772cecd2e919