Merge "Support signing custom_images with AVB" am: e09809a32d
am: d8c0bb8f61

Change-Id: Idd84fb3f75687b5cb3bab8dee47164eb9ec5fec5