Merge "Correctly handle EINTR return from futex"
am: f05ccaf2cc

Change-Id: I414188a3ea6a4e5012a3c7e3aa1dec80e7d23020