Merge "avb: Support loading of recovery image"