add missing LONGSHOT and CAMERA_META_DATA values into camera.h

Change-Id: I94135b1c638c108e0d6af7995b3f8a73160ed036
Merge branch 'cm' into HEAD