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

Change-Id: I9c15c6fb37f762dbe6e70c1739a78755f2fb1b9b