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

Change-Id: I8726d4f35bf9bc5272c01ee6cc2cf332df8ebfad