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

Change-Id: I80671c4d3cb61d2a299496547672338213de8741