Merge \"Basic A/B bootloader tests via bootctl\"
am: 0ef925afc0

Change-Id: I3f438cef798c59c856326b389a1b162cdd31e33a