am e22e9935: am 7af11689: Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev

* commit 'e22e9935d1aff7224d1179385481a17886e41db2':
  Camera2: Adjust sensor dimensions for correct FOV.