am b5d5099b: am b6c38e9d: Camera2: Remove redundant Keys classes

* commit 'b5d5099b0261ec7df20920cc702bfd0ad28c39f4':
  Camera2: Remove redundant Keys classes