Merge "ART: patchoat compilation fix for mac sdk"
am: 5a0d9b099a

Change-Id: Ibb1a5977984529a4cb36faf3791e13be5b8271c9