Merge "Add support for avbtool in custom_images." am: 8a8ca3438b am: 7cdc14d8b0 am: c900a7cd48
am: c5d5fdee22

Change-Id: I6682a91e7963308d7cbc41438b510addb70acb27