Improve payload magic header handling am: aba70abe81 am: 0f66ef5d8c am: 2b24422c53

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1384020

Change-Id: Id60003e73bcbe0834f30cac185583d5472b85e09