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

* commit 'b0b974c10ce3494fe58be1a3f419656f95c54331':
  Break bionic implementations into arch versions.