Merge "Move arm user.h definitions to sys/user.h."