Add OS X platform changes.

Change-Id: Ib685a2c9a012bbd73b0da99eabce3a0cd0b21358
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>