am a5b671d0: (-s ours) am 32933ff5: am dc4fa7f6: Merge "Fix "adb remount" for when the root directory is in system.img"

* commit 'a5b671d0e38d171105b4c76f5671c2c62549d831':