Sync clang-plugin changes from bug 1497914
Sync clang-plugin changes from bug 1497914

bill-mccloskey/searchfox,bill-mccloskey/searchfox,bill-mccloskey/searchfox,bill-mccloskey/searchfox,bill-mccloskey/searchfox,bill-mccloskey/searchfox