Merge "Camera2 Tests: Fix stream id types" into klp-dev