Merge changes I2e0dacc5,I6962aafa into pi-dev

* changes:
  Fix mac build: Update cfi directives for art_quick_osr_stub.
  Update cfi directives for art_quick_osr_stub.