Merge "Handle inconsistent values for PR_SET_TIMERSLACK_PID in android.os.cts.SeccompTest." into marshmallow-cts-dev
am: e3d4bc0660

Change-Id: Ic3ab207c86b5b169ad774fb29f60712f0525b0eb