Merge "fastboot: Wait for reboot-fastboot to complete before signaling success."
am: b81bc9ec00

Change-Id: Iae7e977baae9e2c939ad1d639ee495c3f8315677