Merge "Update clang-tools to ab/5685004" am: 84a5dee972 am: 93b49290de am: e47013ae38
am: f67fe28f00

Change-Id: I59f4bb8b41050eb6a7723de6870df119f0fbdd13