Code review comment for lp://qastaging/~kissiel/checkbox/story-1241

-1. we cannot merge anything with binary .so files for obvious reasons.

Please feel free to split this up to land bits and pieces that are not blocked by that.