Aperture: Use camera:camera-viewfinder

Change-Id: I2abbd54f0f4f08a283a87a6197a9ec6f3f555c8e
14 files changed