Merge "releasetools: Always use recovery mount options."