Merge "Camera2: Update for camera2 API changes" into lmp-dev