Merge "Revert "Camera2: Update stream num tag specs""