Merge "Error correction: Use libfec in blockimg.cpp for recovery"