Merge "Add support for avbtool in custom_images."
am: 8a8ca3438b

Change-Id: I254462e57038902852be421cbfb4cccab9dbe444