Merge "Revert "Remove lz4 prebuilts""