Merge "Increase timeout for jsr166.StampedLockTest#testReadLockInterruptibly"