am 12e66666: am 7fe6ac0d: Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev

* commit '12e666660a8ff9dabc5270a8d06b402481d97a14':
  camera2: Add height to the crop region metadata property