Merge "Fix two clang-tidy issues in crasher.cpp." into pie-cuttlefish-testing