Merge changes I692a1b6c,I2a894134

* changes:
  adb-remount-test: Redirect all test output to stderr
  adb-remount-test: Harden error handling and fix typo