Merge "Fix arm64 and x86_64 code generator assertion"
am: 7b7f8b4e07

Change-Id: I784f30725f47e9a9268127610b4b2c1c6ffde074