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

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