Merge "Refactor flickerlib dependencies"