Merge "Reorder assert-max-image-size and AVB signing" am: eea732dbcf am: d16f9c5301
am: d8cf3043b9

Change-Id: I9220a62e58e1033887e53bd429aa3a489f078a4d