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

* commit '8ecf4114dad8def74266efe5ad9e7a8a1874bbd1':