Merge "ART: patchoat compilation fix for mac sdk"