Merge "DO NOT MERGE: Move camera headers to camera/include"