Merge "Re-enable LZ4_compress_HC in image writer"