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