Merge "Make arm64-scratch-register less dexer dependent"
am: 925b514b42

Change-Id: If2f2ccaa6f8048477d3e90d47746f42f9fd2b6fb