am 424a69d5: Merge "Only generate private symbols that are needed."

* commit '424a69d502db85ffaecf9cad00321b677616a9c5':
  Only generate private symbols that are needed.