Aperture: Reformat code

Change-Id: I7b0227d17fff34d5207715fadb4eedc209007124
9 files changed