Merge changes I0bbdf83d,I70156f98
am: 93622f95a8

* commit '93622f95a8ee8828d3130fa54f38fb4806119e45':
  ART: Fix Mac build
  ART: Optimize PreSetup pass for oat-file open

Change-Id: I61578ec04c07685c62478b7fa01cf697822f64eb