Merge "Support signing custom_images with AVB" am: e09809a32d am: d8c0bb8f61 am: e047421956
am: 90f4777cdd

Change-Id: I3c647c2b2ed866755d3728cb64a8f7c08c3719f1