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

Change-Id: I89e3ec2451bc1d9ffa74b648de74da2e18191937