Aperture: Merge flash and torch buttons

Change-Id: I1bf13fb1f68d64b06c3f20eb2438fd69313a43a1
8 files changed