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

Change-Id: I971819d08bb028c19c8d2ea5b6cbfee13fc59c2c