Merge "X86_64: Add allocation entrypoint switching for CC is_marking"
am: ab191538a1

Change-Id: I568ce012c3e585fade7bb919182cdaa4ae2be086