am fe9b010e: am 47b1416f: Merge "Fix poisoining bug in arm64."

* commit 'fe9b010e49d8cc1bd45f2838845dff0f1c31aa79':
  Fix poisoining bug in arm64.