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

Change-Id: I38a3412d5d8bde79043af4bde8ecb3ed60f9ca8b