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

Change-Id: I8fd6452735ad0fd710c42d4bfccbc76c75a002e8