Revert^2 "Avoid libtistress static link to art"
am: e8a83afa22

Change-Id: I4698f8f7c7d6c6411b9118f31cd0253672fd31e7