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

Change-Id: I2abde6a529f32a1e2471554fa2a598e88f40271f