am 987fc5a3: am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."

* commit '987fc5a3c4046831dc9e6c252e99a9c694bbd9ee':
  Hide various symbols that shouldn't be exposed.