Merge "Allow restart_syscall" am: 1b3350e4ca am: 5b0dd3cbe3
am: 90d299f9f0

Change-Id: Id1d764505410bb7d57f832ce5bb94b3bdbb57424