Static link test lib shims with test -impl libs. am: 38a78e1fa9 am: 5871a92c46
am: c217673b8c

Change-Id: I21d7673d05a175132ac5567d10eb6a2e9f368138