Merge "releasetools: Fix the bug with TARGET_NO_RECOVERY." into brillo-m7-mr-dev