am 801ee194: am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img"

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