...in --enable-online-update=mar code, after
7d8e9444 "convert a<b?a:b to std::min(a,b)"

Change-Id: I8d03b2fc785595267c855c8ac9953d35782c7718