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

Change-Id: I558f389f4cb28990d80322d6a7cc58d74f838f6b