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