Merge "Allow restart_syscall"
am: 1b3350e4ca

Change-Id: I204d0bfb4c80aada7d7e4027c274f3c07ce22783