am 980508b0: Merge "Break bionic implementations into arch versions."

* commit '980508b0ead3ee01e99e93635c57eb76d1aba62d':
  Break bionic implementations into arch versions.