am e086840c: Merge "build against frameworks/opt photo viewer" into jb-ub-mail-ur8

* commit 'e086840cdbb28018f1bb3b60a95d7f471172d575':
  build against frameworks/opt photo viewer