Merge "ART: Update stl_util.h"