am 4c95d081: Switch to frameworks/opt/photoviewer

* commit '4c95d081c31d09a6e1770da6a6b3e37a67fbcf0a':
  Switch to frameworks/opt/photoviewer