Merge "Revert workaround of clang-tidy segmentation fault."
am: 243ab9cc7e

Change-Id: I5019b04384e22b37e809e4c10215bac7f646070f