DO NOT MERGE: Move camera headers to camera/include
am: 0cc248ee01  -s ours

Change-Id: If43baced29b712d838bd30a9ecba1096ee1b67f9