Merge "ART: Clean up base/utils.h"
am: 1c06528780

Change-Id: I27a1a2850abae1270bf73d531f33865f5effdc07