am b6c38e9d: Camera2: Remove redundant Keys classes

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