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

* commit '2a66ccf1bb4dd0183b65264cb8107ba70748f626':
  Break bionic implementations into arch versions.