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

Change-Id: I79b88c462998785c492916f5045f52e72e434b2c