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