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

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