Merge changes I585167e1,Ia07602bd into cayuga

* changes:
  Fix building of static libs on universal-darwin
  Fix asm offsets generation for universal-darwin builds