Merge "Camera2 Tests: Add multiple stream tests" into klp-dev