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

* commit '9c079c94d7a6dd1a70a155529c86e11787c06c2d':