Merge "ART: Clean up base/utils.h"