Aperture: Cleanup cameras parsing

Change-Id: I5ec9e0e761654137bf0211f09d8993110bf00f84
4 files changed