Change-Id: I58209ae96d21c56cbb8ef796940b6ca3b3ebfa72
Change-Id: I893fa36297b9bd9cff93d082f1736f6860b15c0d
Support for gyp which doesn't support multiple objects in the same static library having the same basename. Change-Id: Ib947eefbaf68f8b177a796d23f875ccdfa6bc9dc