Fix build for PhotoViewerSample am: caf8678091
am: b7b18246dc

Change-Id: I52b8d680c7c3e834b3dd3aecb56847a3a14837d6