am 3fd6b2b9: am 3a1c6dac: Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev

* commit '3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7':
  Add XML files for new camera2 hardware features