am 7cb7cbca: Work around for duplicate symbols in static libs

* commit '7cb7cbcacbc28bb5dadb471cbbda856a9d3e25cd':
  Work around for duplicate symbols in static libs