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

Change-Id: I34ed28be53c24fefca39adc43f6a383aab9acce7