am 6ac5660e: am ade2a929: Merge "bionic: stubs: Make internal symbol static"

Merge commit '6ac5660e1c8fc9934d11ed675771063624ac1b4b'

* commit '6ac5660e1c8fc9934d11ed675771063624ac1b4b':
  bionic: stubs: Make internal symbol static