am 685c63df: Clean up some bionic compatibility cruft.

* commit '685c63df24082a33629ea9b7ac151b81cf2358ff':
  Clean up some bionic compatibility cruft.