am 947f2b8e: Clean up some bionic compatibility cruft.

* commit '947f2b8e66f66f3174a23face8584204c1e6204a':
  Clean up some bionic compatibility cruft.