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

Change-Id: I55c9a0228c5598ca1803ff2bd729f9f44dd5083c