Add more camera includes

Change-Id: I56ecf3ababcd350aa5174990e69461b1e71e35c1