Improve payload magic header handling am: aba70abe81

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

Change-Id: I782c017480514b36ae76edaa5517304b2733aefb