Merge "Clang-format system/keymaster."