merged arch specific code from bionic