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

Change-Id: I0697a6b6a612e7ad353def5f1e1497992bbb1807