Merge \"Fix FOUR_ARG_DOWNCALL assembly stubs on arm and x86.\" into nyc-dev
am: 08e5c07d2c

Change-Id: I6f2687374291c9a3be757551b222f6386fb4ac4e