am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev

* commit 'a7833f861e303d9dea2cf54ceb519ff937f68367':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals