Merge changes I4bee37e1,I801dcec7

* changes:
  adb-remount-test: try to fixup device after reboot (recovery)
  adb-remount-test: try to fixup device after reboot (fastboot)