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

Change-Id: I8fedb8960626ad616d53be0cd01fe8b3d2b4be12