Merge "Testables lib should not statically link mockito"
am: 47d04fc5c0

Change-Id: I4aee182a94fa62a8a254f0bbc480b4de1a4ed688