Merge \"Fix stack alignment in x86 read barrier entry points.\"
am: c96b0b00ad

Change-Id: I15f2fccb7e7f9b04113ac7f81351899b59906d8b