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

Change-Id: I7d7096cf24234925256895c3527f44e72cf07493