Merge "DO NOT MERGE: Move camera headers to camera/include"
am: 5c3df39520  -s ours

Change-Id: If34530d184077d4110a0dc0bd6f046c16c3bc267