Merge "libsparse: replace legacy min() with std::min()"
am: 31f6263bc1

Change-Id: I5ceec7e0e23cc19c9c35757a86d9176333aa7232