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

Change-Id: I4a331773abf1ee7b3fc230f80c973dccbb041340