Merge "adb: use shell for remount to forward return codes." am: edf8040152 am: 86ba5c9433
am: 38c294746b

Change-Id: I087e8ee7818c17530a96fe0516fbde989d38a292