Merge "Camera2: Final API revisions" into lmp-dev