am bb013aa3: Camera2: Renames for API consistency

* commit 'bb013aa3e197e881756be5ad13e6ad30bfb4aeff':
  Camera2: Renames for API consistency