Merge "adbd: fix remount on non-system-as-root devices." am: c2501fda60
am: 31d40d0235

Change-Id: I81de8d605b96d2e7ad55d452e85d63cd185e2224