Merge "Revert "Reorder assert-max-image-size and AVB signing""