am 61980a32: am c5380438: Revert "Camera: Add XML entries and files for new system features"

* commit '61980a326618d3f55f39fb86e9d3005fd975062c':
  Revert "Camera: Add XML entries and files for new system features"