Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS"