Merge "Revert "Make arm64-scratch-register less dexer dependent""
am: 7137b654fe

Change-Id: Ib64bbe5000f2c3a4551c02d4757008a0169e4c6d