Update clang-tools to ab/6114689 and remove type_ids am: 7a0f71a70f am: 3b2574d278

Change-Id: I28238cd4fabc4c9efef3b38701efc555179de323