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