Merge "adb: fix adb remount -R"
am: 948e4fa316

Change-Id: Ifa199efcba566dcd5c7e41c3ae91e9cf51bcd758