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

* commit '7fe6ac0de4b36f89a7f20dafb693e814344f9b4d':
  camera2: Add height to the crop region metadata property