Merge "core/Makefile: add AVBTOOL deps to boot.img for BOARD_AVB_ENABLE"