Fix camera breaking build

Change-Id: Ie7a1ba2374e207406486ed9c6ea567dd4545c351
Remove camera includes for now

Not sure why these damn things are breaking the build, but let's just
get this built and then we can fix these little extra settings on the
camera later.

Change-Id: I6e58b3e3f46416c641dfb75fc13fafcc65874fb4
Merge changes I6e58b3e3,Ie7a1ba23 into lollipop

* changes:
  Remove camera includes for now
  Fix camera breaking build