Merge \"Fix FOUR_ARG_DOWNCALL assembly stubs on arm and x86.\"
am: 4b5c2901d6

Change-Id: I89bcff1d6130225f48321e6173c7e8b53b54e50e