Add more camera includes

Change-Id: I219d26e8eb60573cd6b4072eff2f42be5902b810