Merge "releasetools: Allow building AVB-enabled recovery.img." am: 37066490a5 am: 4d1764b0be
am: e5e6611c29

Change-Id: If6b829d23e578c168ba5a55d90ca175a0c32f13a