C++ cleanup

Bug: 242154834
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I91dc47857efb78b3782f248c50712985e728facf
(cherry picked from commit 9c0c3bc1291f6337a8700306db2e11426f966841)
Merged-In: I91dc47857efb78b3782f248c50712985e728facf
1 file changed