arm, armv8: Fix some comments to refer to the right register am: 1b025fff7c am: 470585e7f0
am: c51a83b036

Change-Id: I21bc8d0c26b57cfe0e12db06f2458870ba33969b