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

Change-Id: I249bb9b4abd799de2e62dcd70bb17bb74c739d66