am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches

* commit '0c7e8aac441c18117b8daf3255d2658b83a37bde':
  Fix build.
tree: 99990811f3e83478662f32c2a5807126853378de
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/