Merge changes I0bbdf83d,I70156f98

* changes:
  ART: Fix Mac build
  ART: Optimize PreSetup pass for oat-file open