Merge "Revert "Revert "Delete clang-4393122""" am: 0d26b283ce
am: 9e2c0bf8c4

Change-Id: Ia497f5ded7c468da90ee25bb360e821259493e03