Merge "build: Fix "adb shell" in recovery for system_root_image."