Merge "ARM64: Fix lack of scratch registers in String.equals() intrinsic." am: 96cc0a004b
am: 6e0c06de32

Change-Id: Icfc3de482ac01c53108c962dc4532baaf3a053a4