Merge "Switch to clang-4053586" am: 1923ed7f41 am: 7315435dce am: 1eb2339708
am: 46ba92a0d9

Change-Id: I4fc181d742236a02f94725a142b874b67ff67cff