Merge "Revert "Add support for LZ4 compressed image files""