DO NOT MERGE: Move camera headers to camera/include am: d008fd1e4f  -s ours
am: bcf7d888d5

Change-Id: I6487c63fc30b40a52c38aa69146378c66e2b7c41