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

Change-Id: I9934758cc21372513761241cc8e3e0bd7ca46b2a