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

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