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

Change-Id: I529dd81faedd155ee22e483e43320575023b7e0a