Merge "Camera tests: Include additional camera metadata header" into oc-dev am: 3623fbace2
am: f72a556a66

Change-Id: I3dd485f0e392a2410e493d4b02e56d751c33ffc3