Merge "adb: use /system/bin/remount command" am: d458066bc7
am: bc0887add7

Change-Id: I3f6725ac4cbb181210f1f91b159cd31674f1b690