am 7c83a1ed: (-s ours) Break bionic implementations into arch versions. DO NOT MERGE

* commit '7c83a1ed81a15f3e75836c1ac7d500a952f02e10':
  Break bionic implementations into arch versions. DO NOT MERGE