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

Change-Id: Ib782b5632b7e348efcfec31a5e396d4f28464e9a