Merge "Make bsdiff available in recovery"