Merge "Make static libtistress version" am: 0f8d2d1481
am: 79f101a25e

Change-Id: I782c7d12c4775d7768c07d0f4889d5e9bd1685af