Merge "adb: Fix `adb remount`"
am: a54c293822

Change-Id: I09b604d98784c56af74d771def395127af45a40d