Aperture: Match activities from Camera2

Change-Id: I7e74ee1c565efad942e00725b81ffafd01b2ebd0
9 files changed