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

Change-Id: Ibf0d7fa2b01984d39c9e0b155d3e710d56823f6f