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

Change-Id: I2df96411b228c0f015c3d83a29c4436551cb5ab6