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

* commit 'bcd7ae6f30149a2296d7288c74ffe6c90188f93d':
  build: Fix "adb shell" in recovery for system_root_image.