am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev

* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
  Camera2: Final API revisions