Merge "Fix clang-tidy warnings in bootable/recovery."