Merge "Switch to clang-r353983b."
am: 28e2d001ef

Change-Id: Id494050e454c8d4ddd66de6c7e206ec94cf35e64