Merge "Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64)." am: 20eef17
am: 6461885

* commit '64618859ba57957c05001c0be137a2c472e254f3':
  Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64).

Change-Id: I2fb7a4c4540d7d10c7059c4a9331cba41609e1d6