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

Change-Id: I26821f538dd4e45245e4ebcca766f6bc754cae5e