Fix "adb remount" for when the root directory is in system.img
am: a852aacb56  -s ours

* commit 'a852aacb569f718ef08519c3f0cadc0562c0768b':
  Fix "adb remount" for when the root directory is in system.img