Revert "Make arm64-scratch-register less dexer dependent"

Still failing on armv8.

This reverts commit 39d764d01b28a3678e5e33dfa517db65d66c2058.

Change-Id: I93a48fe2c4926d8e560a36c92f11bd91cde4a238
2 files changed