Merge "Add an operation using a semaphore to test 004-ThreadStress."
am: 46a62897ce

Change-Id: I6e2080d5da3200b2e5025d04e472d66c894823ea