Merge "Fix FOUR_ARG_DOWNCALL assembly stubs on arm and x86." into nyc-dev