Merge "Support signing custom_images with AVB"
am: e09809a32d

Change-Id: I292276a499f185d6eff84a2996d9b987a5209124