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

Change-Id: Idc56e32bc71aa82e0a80cbb1ac537b06e89c7129