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