Remove circular dependencies in flickerlib

Test: npm run test:presubmit
Change-Id: I6cc3548f0a74b4aa55e0f80bb455a50ac888a3b0
8 files changed