Merge
Merge branch 'unified_build' of https://github.com/blefaudeux/PTAM-GPL into unified_build

Conflicts:
	third_party/cvd/src/i686/utility_byte_differences.cc
	third_party/cvd/src/i686/utility_double_int.cc
	third_party/cvd/src/i686/utility_float.cc
	third_party/cvd/src/noarch/yuv422_wrapper.cc