Update to fix tiff dependency issues when using system-tiff

Change-Id: I345d0b18174f0f11c9fef930299ec311aaa63171
Merge topic 'fix_tiff_dependency_issues' into next

f15b1a24 Update to fix tiff dependency issues when using system-tiff