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

  $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys

  $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \

          > $(TARGET_RECOVERY_ROOT_OUT)/default.prop

  $(if $(filter true,$(BOARD_BUILD_SYSTEM_ROOT_IMAGE)), \

    $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system_root; \

            rm -rf $(TARGET_RECOVERY_ROOT_OUT)/system; \

            ln -sf /system_root/system $(TARGET_RECOVERY_ROOT_OUT)/system) # Mount the system_root_image to /system_root and symlink /system.

  $(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk)

  $(if $(filter true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)), \

    $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1).unsigned, \