Merging camera test with gallery test.

Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
17 files changed