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

Change-Id: Ief2e439cdbff7263e9ffbb7d9f0ec8371fea14f9