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

Change-Id: I7eb55a7e8ed7880f9a41350d8067173cff016d8a