Rework interactions between AvbOps and AvbABOps.
am: 574ed99917

Change-Id: I33863d901575903f6447c13db24131e8bbab2691