Fix build for AppCompatPhotoViewerSample am: 81a4ccb237
am: f2caaa491d

Change-Id: I0e7bb4ec0d532320c5823d9697f6390a7303b138