Merge "Fix android-cloexec-pipe clang-tidy warning"