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