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

Change-Id: Ifda8ff6d76ecd4da46b4fc44b5850de860eb5497