armv8: Remove unnecessary register shuffling am: f1c718c267 am: 5b4af7824f
am: 9d5e6ef9fc

Change-Id: Ia5b021551e7fe9d7f1d7dd4533842411c06798ce