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

Change-Id: Ide9ecce1c40f2af538c06df9aad1263aae22ae6b