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

Change-Id: I7f13e0a983fcd8dfa57bd012460dd259d1e82516