Merge "Add support for avbtool in custom_images."