Merge "ART: Fix mac build" am: 049f2a58ea
am: 73c34395da

Change-Id: I961bf7b29f601ac7472760b03c1ff5599aa9b0d9