Merge "Enable darwin build" am: a117dc79f7 am: 12476d414a am: 50a8255965
am: 239f015d17

Change-Id: I0e40e1978a893e6a81d1a90b7ed236176c9d6d30