Merge "Make the NOT_CONFIG_SYSVIPC test also exercise the syscalls" am: b849b1878c
am: 4e3637bba3

Change-Id: I55815b0bca398c5ff513a3699714170e5591dc7d