Merge "ART: More header cleanup - mem_map.h"