Fix potential lint errors

Bug: 200914293
Test: m cpplint-art (using tools/repo-hooks/tools/cpplint.py)
Test: treehugger
Change-Id: I8ec57527ad7ce94b26c4f65727f536a5ebbbd6aa
4 files changed