armv8: Remove unnecessary register shuffling
am: f1c718c267

Change-Id: I43a718f08a820689f58fee13a9fe3549615b555a