Merge "Add missing manifest in clang-4053586"