Merge "ART: Fix Mac build" am: 9ae527f615
am: f35d96a1e3

Change-Id: I6a9ca0402409fbbb42cb253c09f9b062827b895d