This helps to break the circular dependency between common and blockimgdiff. Bug: 32379627 Test: unit tests pass Change-Id: I90b5ff34782acbfac86f36265bd96c207d898bf6