Use a separate activity for capture intents

Bug: 17911061
Change-Id: Id5d3e5347c1830dc43b8962c1494bb4bf5195136
2 files changed