Merge "Convert frameworks/opt/photoviewer to Android.bp"
am: 30dc726a7d

Change-Id: Ic17611c699e43426659e111f2cdb34ac8c086189