am 93773991: Merge "Add some missing \'static\'s."

* commit '9377399150d323ea39e6abe6a44460ea33826ce4':
  Add some missing 'static's.