am 8cca0154: am b0b974c1: am 2a66ccf1: am 980508b0: Merge "Break bionic implementations into arch versions."

* commit '8cca015403f2f021d557fc81a0423a04a551448a':
  Break bionic implementations into arch versions.