Merge "Merge "Testables lib should not statically link mockito" am: 47d04fc5c0 am: b42cd23425 am: 0a6f66e9a9  -s ours"