Merge "Break bionic implementations into arch versions."