Merge \"x86: Fix CFI info for FOUR_ARG_DOWNCALL.\"
am: 2150d94b5a

Change-Id: Ifc8ee429da31647927ed0c928c36760f55b0ff6a