Merge "adbd: Fix adb remount when switching roots during first-stage init." am: 15e1b3b85a
am: 0df54b8f00

Change-Id: I5992afb3130c46dd0930b50eae7cd708f59d58de