Merge "Makefile: Add avbtool to INTERNAL_USERIMAGES_DEPS" am: ccac0f861b am: ba0be93555 am: abd4388b4c
am: ec462e6f90

Change-Id: I31bbe964688e4b41b5738fd98330e760b83a27d7