am cc3fcd04: am 477b12b4: Fix missing camera from aosp builds.
am cc3fcd04: am 477b12b4: Fix missing camera from aosp builds.

* commit 'cc3fcd04f40549dff1c95aec71dfaf1f793750a8':
  Fix missing camera from aosp builds.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build