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

Change-Id: Ibd386810c4d6d2f955ff76e69c71b67101ec6c08