Merge "The darwin linker does not support version scripts" am: a911933a23 am: aa07f58bcf am: ab0a3cd806

Change-Id: I970c526e9c1454feff625e1207ac0ba9660a7a63