Merge "Switch to clang-3859424." am: af077e293b
am: 2e51c40eca

Change-Id: I196dcf9822c5efdb2cddc46af0656e2d7f408ef6