Merge "CtsVerifier: Modify camera intents test to test for exif and location of image"
am: 4ad716fdca

Change-Id: I30db5ac1cd8a8c011a29eee7d0f50f961b6f5ef7