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

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