Merge "Make static libtistress version"
am: 0f8d2d1481

Change-Id: I938a23fb655f6df2c18c5a78d56435d56e988445