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

Change-Id: I4a3e0f7b8b0af1c9d39b8308b17da7e9c80c2cd0