Merge "Switch to clang-4053586"
am: 1923ed7f41

Change-Id: I2c76b56eb40f35249c963e5757d45d32cc764a93