Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY."