Merge "Switch to using clang-3289846." am: 7ec2a39c3f
am: 523543b17c

Change-Id: Ifa9434cb0ca7ea0f57b436305b72f4d22af5b4b1