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

Change-Id: Icb86f96eb9b8ca632217dc9f8c7a77c4bede6484