manually merged in all of 231 ... default target architecture is now used from APK mojo