Merge "ART: Update stl_util.h"
am: 29365184fe

Change-Id: I2e394357ae8ee96df08e164e3507d4c5c4a85088