Merge "Camera2: cleanup unused imports" into klp-dev